Thomas Girard: ACE+TAO Debian packaging moved to git
svn-all-fast-export --identity-map authors.txt --rules pkg-ace.rules svn-pkg-aceHere's the content of the pkg-ace.rules configuration file that was used:
create repository pkg-ace end repository match /trunk/ repository pkg-ace branch master end match match /(branches tags)/([^/]+)/ repository pkg-ace branch \2 end matchThe author mapping file authors.txt being:
markos = Konstantinos Margaritis <email-hidden> mbrudka-guest = Marek Brudka <email-hidden> pgquiles-guest = Pau Garcia i Quiles <email-hidden> tgg = Thomas Girard <email-hidden> tgg-guest = Thomas Girard <email-hidden>The tool sample configuration file merged-branches-tags.rules recommends to post-process tags, which are just a branch in SVN. That's why the configuration file above treats branches as tags. The conversion was indeed fast: less than 1 minute.
svn tags as branches:
Branches are marked with green rectangles, and tags with yellow arrows.
What we have here (expected given our configuration of the tool) are
branches (e.g. 5.4.7-5) corresponding to tags, and tags matching the SVN
tagging commit (e.g. backups/5.4.7-5@224). We'll review and fix this.
merged code that did not appear as such:
Branches that were not merged using svn merge look like they were not
merged at all.
commits with wrong author:
Before being in SVN, the repository was stored in CVS. When it was imported
into SVN, no special attention was given to the commit author. Hence I
got credited for changes I did not write.
obsolete branches:
The tool leaves all branches, including removed ones (with tag on their end)
so that you can decide what to do with them.
missing merges:
The branch 5.4.7-12 was never merged into the trunk!
- Pro Git, written by Scott Chacon
- The Git Community Book
#!/usr/bin/env ruby # # retag.rb # # Small script to create an annotated tag, specifying commiter as well as # date, and tag comment. # # Based on Scott Chacon "Custom Importer" example. # # Arguments: # $1 -- tag name # $2 -- sha-1 revision to tag # $3 -- committer in the form First Last <email> # $4 -- date to use in the form YYYY/MM/DD_HH:MM:SS def help puts "Usage: retag <tag> <sha1sum> <committer> <date> <comment>" puts "Creates a annotated tag with name <tag> for commit <sha1sum>, using " puts "given <committer>, <date> and <comment>" puts "The output should be piped to git fast-import" end def to_date(datetime) (date, time) = datetime.split('_') (year, month, day) = date.split('/') (hour, minute, second) = time.split(':') return Time.local(year, month, day, hour, minute, second).to_i end def generate_tag(tag, sha1hash, committer, date, message) puts "tag # tag " puts "from # sha1hash " puts "tagger # committer # date +0000" print "data # message.size \n# message " end if ARGV.length != 5 help exit 1 else (tag, sha1sum, committer, date, message) = ARGV generate_tag(tag, sha1sum, committer, to_date(date), message) end
me@mymachine$ echo 6a6d48814d0746fa4c9f6869bd8d5c3bc3af8242 11cf74d4aa996ffed7c07157fe0780ec2224c73e 898ad49b61d4d8d5dc4072351037e2c8ade1ab68 >> .git/info/grafts
#!/bin/sh br="HEAD" TARG_NAME="Raphael Bossek" TARG_EMAIL="hidden" export TARG_NAME TARG_EMAIL filt=' if test "$GIT_COMMIT" = 546db1966133737930350a098057c4d563b1acdf -o \ "$GIT_COMMIT" = 23419dde50662852cfbd2edde9468beb29a9ddcc; then if test -n "$TARG_EMAIL"; then GIT_AUTHOR_EMAIL="$TARG_EMAIL" export GIT_AUTHOR_EMAIL else unset GIT_AUTHOR_EMAIL fi if test -n "$TARG_NAME"; then GIT_AUTHOR_NAME="$TARG_NAME" export GIT_AUTHOR_NAME else unset GIT_AUTHOR_NAME fi fi ' git filter-branch $force --tag-name-filter cat --env-filter "$filt" -- $br(Script edited here; there were much more commits written by Raphael.)
Important
It's important to realize that the whole selected branch history is rewritten, so all objects id will change. You should not do this if you already published your repository.
Hint
Once git filter-branch completes you get a new history, as well as a new original ref to ease comparison. It is highly recommended to check the result of the rewrite before removing original. To shrink the repo after this, git clone the rewritten repo with file:// syntax -- git-filter-branch says it all.
Add graft points where needed.
Clean tags and branches. Using git tag -d, git branch -d and the Ruby script above it was possible to recreate tags. During this I was also able to add missing tags, and remove some SVN errors I did -- like committing in a branch created under tags/.
Remove obsolete branches.
Merge missing pieces. There were just two missing debian/changelog entries. I did this before git filter-branch because I did not find a way to use the tool correctly with multiple heads.
Fix commit author where needed. Using the shell script above Raphael is now correctly credited for his work.
| [1] | http://lists.alioth.debian.org/pipermail/pkg-ace-devel/2011-March/002421.html |
| [2] | available in Debian as svn-all-fast-export |
Ok, so finally it is official!
We just had the DebConf 12 decision meeting. We saw two great proposals, from the cities of 
Out of curiosity, and because it is Sunday morning and I have a cold and
can't get my brain to do anything tricky, I counted the number of
candidates in each year's DPL elections.
but you ll be traveling the world while reading him.
My questions are in bold, the rest is by Christian.
Who are you?
I am a French citizen (which is easy to guess unless you correct my
usual mistakes in what follows). I m immensely proud of being married
for nearly 26 years with Elizabeth (who deserves a statue from Debian
for being so patient with my passion and my dedication to the
project).
I m also the proud father of 3 wonderful kids , aged 19 to
23.
I work as team manager in the Networks and Computers Division of Onera
the French Aerospace lab , a public research institute about
Aeronautics, Space and Defense. My team provides computer management
services for research divisions of Onera, with a specific focus put on
individual computing.
I entered the world of free software as one of the very first users of
Linux in France. Back in the early 1990 s, I happened (though the BBS
users communities) to be a friend of several early adopters of Linux
and/or BSD386/FreeBSD/NetBSD in France. More specifically, I
discovered Linux thanks with my friend Ren Cougnenc (all my free
software talks are dedicated to Ren , who passed away in 1996).
You re not a programmer, not even a packager. How did you come
to Debian?
I m definitely not a programmer and I never studied computing (I
graduated in Materials Science and worked in that area for a few years
after my PhD).
However, my daily work always involved computing (I redesigned the
creep testing laboratory and its acquisition system all by myself
during my thesis research work). An my hobbies often involved
playing with home computers, always trying to learn about something
new.
So, first learning about a new operating system then trying to
figure out how to become involved in its development was quite a
logical choice.
Debian is my distro of choice since it exists. I used Slackware on work
machines for a while, but my home server, kheops,
first ran Debian 1.1 when I stopped running a BBS on an MS-DOS machine
to host a news server. That was back in October 1996.
I then happened to be a user, and more specifically a user of
genealogy software, also participating very actively in Usenet from
this home computer and server, that was running this Debian thing.
So, progressively, I joined mailing lists and, being a passionate
person, I tried to figure out how I could bring my own little
contribution to all this.
This is why I became a packager (yes, I am one!) by taking over the
geneweb package, which I was using to publish my genealogy
research. I applied as DD in January 2001, then got my account in July
2001. My first upload to the Debian archive occurred on August 22nd
2001: that was of course geneweb, which I still maintain.
Quite quickly, I became involved in the work on French localization. I
have always been a strong supporter of localized software (I even
translated a few BBS software back in the early 90 s) as one of the
way to bring the power and richness of free software to more users.
Localization work lead me to work on the early version of Debian
Installer, during those 2003-2005 years where the development of D-I
was an incredibly motivating and challenging task, lead by Joey Hess
and his inspiring ideas.
From user to contributor to leader, I suddenly discovered, around
2004, that I became the coordinator of D-I i18n (internationalization)
without even noticing 
OK, I still have to load my photos of Debconf10 somewhere. Shame on
me. My gallery is broken (no longer allows uploads, even local ones!).
Still, do you remember that we somehow mentioned that a small bunch of
geeks did run together a local race at Debconf10?
Indeed, a dozen of Debconf10 attendees did participate to the Van
Cortland Track Club Summer Series run of Thursday August 5th. And all
of us completed this 5km cross-country run in Van Cortland Park, in
Bronx, turning it into the most international attendance of this local
race.
DebConf continued until Saturday, but Friday the 6th was my last day as I left New York that evening. I m a bit late in getting this summary written up.
Between work and parenthood, I'm struggling to keep on top of things a bit
at the moment, but so I'm a bit late to the party.
Quite a few things have happened recently in the Debian/ARM land
It's been a couple of very interesting days. The 
This blog post is actually a response to a talk that was given at the debconf last week. It was marga's talk about 
Nearly at the end of the week already - time flies! As always, it's
been a great event. The orga folks have done a wonderful job, and New
York is a cool place. Well, rather more of a hot place at the moment
with the weather... :-)
The highlight for me, as always, has been meeting up with people
during the conference. Old friends like Lars, Joey, Marga, Bdale (and
many more than I can mention here!). And finally getting to say hi to
people whom I feel I know well from their blogs via Planet, and their
Debian work that I benefit from every day. It was great to
see 
